Merge from trunk and resolve conflicts.
authorEli Zaretskii <eliz@gnu.org>
Thu, 28 Mar 2013 18:13:59 +0000 (20:13 +0200)
committerEli Zaretskii <eliz@gnu.org>
Thu, 28 Mar 2013 18:13:59 +0000 (20:13 +0200)
commite864b2e5645ec7eef007c5efc27d85c78b4225c4
tree25e61c6b6d285a3c9aefd80614813fc54e97633f
parentcf48184748bf27b66416df1b4c14f4d6c756548b
parent1f0837cd66625ef7b20a3615f7faa41e6273581a
Merge from trunk and resolve conflicts.
configure.ac
nt/inc/sys/socket.h
nt/inc/sys/time.h
nt/inc/unistd.h